fix rerendering of templates
update view
merge conflicts
create proxy for swipe api