Refactored html templates