better UX on toolbar and login screen