commented out modal for now
minor fixes
Merge branch 'frontend'