CSS Overhaul part 2