Add missing markup and css classes