Added more html elements to be designed