fixed frontend stuff with login
merge