Updated css and the ui of the pages
merged the code