better css, other refactoring