Added some visual tweaks