UI Cleanup

Mostly refactored code, small visual changes