#170 Markup and Backbone fixes