css refactoring -- should be working properly now
merge