Various little tweaks with styling 2