reordered some stuff, cleaned up less css code