new manager screen
new manager screen
fixing merge conflicts