Complete overhaul of app