Final cleanup/CSS update