Final visual tweaks

Done