Organizing the app and fixing the design