Initial UI Setup

Merge the UI components into master
Again, due to the considerable amount of logic in these types of methods, there should probably be a service that configures the shapes for us