consolidated css, much prettier now