Initial UI Setup

Merge the UI components into master
Why do you need the difference here?