Added css that was missing from merge, minor refactoring