refactoring and adding some html