Edited back screen manifest activities, refactored the two abstract activities to be renamed with Abstract included in their name
Fixed display message in view staff fire option, merged code with master