Moved HTML into template files