Refactoring html and tidying up code
Refactoring html and tidying up code