Minor refactoring of Main/Login and Auth Activities