UI and query fixes
Merge webapp.js conflict
Edit fixes/ Data retrieval fixes, UI fixes