Refactor view logic
Add ajax updates
Refactor javascript
Merge branch 'ajax-updates' into develop