New staff button half working
Fix merge conflict