Cleaned off the app, ready for styling overhaul