Layout, css refactoring
TODO extended