Working login modal
Merge branch 'modals'
minor modal tweaks