Re-organize CSS & Layouts