Refactoring layout and CSS
nil