Finished Css and Edited Html to be merged