UI Cleanups. Styles