Initial UI Setup

Merge the UI components into master