Initial UI implementation
UI Additions