Rebuilt to separate HTML into template and improved default cartridge