Improved ui

Merging Usability overhaul back with master production branch.