minor refactoring - mostly css