Some styling tweaks and changes...