Tweaking and tightening a bit
More visual tweaks