Changed minimap size and orienatation, took out alarms temporarily, and fixed objective line
Merge conflicts