Updated login and main activity