adding some ui love and edited handlebars templates