Added more HTML and static elements