A bunch of changes, including adding the login activity, and cleaned some stuff up