Removing html from base classes, putting it in demo classes