master

Complete overhaul of the ui section.