Back buttons now working
Fixed display message in view staff fire option, merged code with master