refactoring some more stuff into different css classes