Fixed layout and css files
Merged