Improved ui

Merging usability overhaul into major production branch.