Quite a bit of visual tweaking