fixed layout, rewriten underscore templates, simplified js