- removed mode variable - reverted html template accordingly - added a more specific helper - fixed some short variable names