Major improvements, handlebars templates, bug fixes, styling