add frontend changes from new_user_model branch