UI styling, some structure refactors