Branch updates for what I'm working on

Change form login to show office manage home screen and menu. Fix
combobox display items to proper user types.