Htlm refactoring and identation