WIP - more visual tweaks