some css refactoring, a step in the right direction but far from finished