Second pass of login/general UI functionality