Final styling tweaks before QA