The focus of this milestone is to clean up the app - after all, there are still some fragments after the recent refactoring.