Css display refactoring