Moved HTML into templates