Work on layout and css files organization