Added more css and reordered some html