Added login-modal (in progress)
Merge with master