More design changes, moving css to main