UI Overhaul

First of the many UI changes to come for version 1.1