UI Cleanup

UI Cleanup Styling