Major overhaul of the application
Misc Stuff