Simpler CSS & little tweaks