Major changes to site layout and UI
Minor change to facilitate ajax refresh
Fix merge conflict in app.js