Modify css names to match new naming + additional cleanup.