Further adjustments to CSS strcture