WIP more visual tweaks