cleanup markup && still working on marionette integration with API