Organizes css, improvements to new layout