Initial UI Setup

Merge the UI components into master
Get rid of this