UI Modifications
Fixed merge issues
Implemented UI
Changes to UI