Corrected bounding
Simplified switch handlebars helper :)