Some js wasn't getting loaded at login. and other fixes