UI Update

Lots of implementation to the UI and some just messing around fixs