Fixed minor bugs related to the file structure
Moved the css to one file