Refactor/layout css