WIP: Added majority of UI

UI updates