Finished login page integration. Should be working, but notifications is a bit wonky
fixed merge conflicts