diff --git a/src/commons/achievement/AchievementCard.tsx b/src/commons/achievement/AchievementCard.tsx
index 335c56480f..3651ef5fb2 100644
--- a/src/commons/achievement/AchievementCard.tsx
+++ b/src/commons/achievement/AchievementCard.tsx
@@ -22,7 +22,7 @@ function AchievementCard(props: AchievementCardProps) {
 
   const [focusUuid, setFocusUuid] = focusState;
 
-  const { ability, cardBackground, title } = inferencer.getAchievement(uuid);
+  const { cardBackground, title } = inferencer.getAchievement(uuid);
   const displayDeadline = inferencer.getDisplayDeadline(uuid);
   const displayXp = inferencer.getAchievementXp(uuid);
   const progressFrac = inferencer.getProgressFrac(uuid);
@@ -38,7 +38,7 @@ function AchievementCard(props: AchievementCardProps) {
       onClick={() => setFocusUuid(uuid)}
       onClickCapture={toggleDropdown}
       style={{
-        ...handleGlow(uuid, focusUuid, ability),
+        ...handleGlow(uuid, focusUuid),
         opacity: shouldRender ? '100%' : '20%',
         background: `url(${cardBackground}) center/cover`
       }}
@@ -58,10 +58,7 @@ function AchievementCard(props: AchievementCardProps) {
         </div>
 
         <div className="details">
-          <div className="ability">
-            <p>{ability}</p>
-          </div>
-          <AchievementDeadline ability={ability} deadline={displayDeadline} />
+          <AchievementDeadline deadline={displayDeadline} />
           <AchievementXp isBonus={hasDropdown} xp={displayXp} />
         </div>
 
diff --git a/src/commons/achievement/AchievementManualEditor.tsx b/src/commons/achievement/AchievementManualEditor.tsx
index d16f105c36..a57f399f2b 100644
--- a/src/commons/achievement/AchievementManualEditor.tsx
+++ b/src/commons/achievement/AchievementManualEditor.tsx
@@ -1,5 +1,5 @@
-import { Button, MenuItem, NumericInput } from '@blueprintjs/core';
-import { ItemRenderer, Select } from '@blueprintjs/select';
+import { Button, Checkbox, MenuItem, NumericInput } from '@blueprintjs/core';
+import { ItemPredicate, ItemRenderer, Select } from '@blueprintjs/select';
 import { useContext, useEffect, useState } from 'react';
 import { AchievementContext } from 'src/features/achievement/AchievementConstants';
 import {
@@ -8,7 +8,11 @@ import {
   GoalProgress
 } from 'src/features/achievement/AchievementTypes';
 
+import { showSuccessMessage, showWarningMessage } from '../utils/NotificationsHelper';
+
 type AchievementManualEditorProps = {
+  hiddenState: [boolean, any];
+  userState: [AchievementUser | undefined, any];
   studio: string;
   users: AchievementUser[];
   getUsers: () => void;
@@ -19,9 +23,22 @@ const GoalSelect = Select.ofType<AchievementGoal>();
 const goalRenderer: ItemRenderer<AchievementGoal> = (goal, { handleClick }) => (
   <MenuItem key={goal.uuid} onClick={handleClick} text={goal.text} />
 );
+const goalPredicate: ItemPredicate<AchievementGoal> = (query, item) =>
+  item.text.toLowerCase().includes(query.toLowerCase());
+
+const UserSelect = Select.ofType<AchievementUser>();
+const userRenderer: ItemRenderer<AchievementUser> = (user, { handleClick }) => (
+  <MenuItem key={user.courseRegId} onClick={handleClick} text={user.name} />
+);
+const userPredicate: ItemPredicate<AchievementUser> = (query, item) =>
+  item.name.toLowerCase().includes(query.toLowerCase());
+
+export function updateGoalProcessed() {
+  showSuccessMessage('Goal updated');
+}
 
 function AchievementManualEditor(props: AchievementManualEditorProps) {
-  const { studio, getUsers, updateGoalProgress } = props;
+  const { userState, hiddenState, studio, getUsers, updateGoalProgress } = props;
   const users =
     studio === 'Staff'
       ? // The name can be null for users who have yet to log in. We push these to the back of the array.
@@ -39,24 +56,23 @@ function AchievementManualEditor(props: AchievementManualEditorProps) {
     .getAllGoals()
     .filter(goals => goals.meta.type === 'Manual');
 
-  const [goal, changeGoal] = useState(manualAchievements[0]);
-  const [selectedUser, changeSelectedUser] = useState(users[0]);
-  const [count, changeCount] = useState(0);
-
-  const UserSelect = Select.ofType<AchievementUser>();
-  const userRenderer: ItemRenderer<AchievementUser> = (user, { handleClick }) => (
-    <MenuItem key={user.courseRegId} onClick={handleClick} text={user.name} />
-  );
+  const [goal, changeGoal] = useState<AchievementGoal | undefined>(undefined);
+  const [selectedUser, changeSelectedUser] = userState;
+  const [count, changeCount] = useState<number>(0);
+  const [viewHidden, changeViewHidden] = hiddenState;
 
   const updateGoal = () => {
-    if (goal) {
+    if (goal && selectedUser) {
       const progress: GoalProgress = {
         uuid: goal.uuid,
-        count: count,
+        count: count < 0 ? 0 : Math.floor(count),
         targetCount: goal.targetCount,
         completed: count >= goal.targetCount
       };
       updateGoalProgress(selectedUser.courseRegId, progress);
+    } else {
+      !goal && showWarningMessage('Goal not selected');
+      !selectedUser && showWarningMessage('User not selected');
     }
   };
 
@@ -64,10 +80,12 @@ function AchievementManualEditor(props: AchievementManualEditorProps) {
     <div className="achievement-manual-editor">
       <h3>User: </h3>
       <UserSelect
-        filterable={false}
+        filterable={true}
         items={users}
         itemRenderer={userRenderer}
+        itemPredicate={userPredicate}
         onItemSelect={changeSelectedUser}
+        noResults={<MenuItem disabled={true} text="No matching user" />}
       >
         <Button
           outlined={true}
@@ -78,10 +96,12 @@ function AchievementManualEditor(props: AchievementManualEditorProps) {
 
       <h3>Goal: </h3>
       <GoalSelect
-        filterable={false}
+        filterable={true}
         items={manualAchievements}
         itemRenderer={goalRenderer}
+        itemPredicate={goalPredicate}
         onItemSelect={changeGoal}
+        noResults={<MenuItem disabled={true} text="No matching goal" />}
       >
         <Button outlined={true} text={goal ? goal.text : 'No Goal Selected'} color="White" />
       </GoalSelect>
@@ -91,12 +111,20 @@ function AchievementManualEditor(props: AchievementManualEditorProps) {
         value={count}
         min={0}
         allowNumericCharactersOnly={true}
+        minorStepSize={null}
         placeholder="Count"
         onValueChange={changeCount}
       />
 
       <h3> </h3>
       <Button outlined={true} text="Update Goal" onClick={updateGoal} intent="primary" />
+
+      <h3> </h3>
+      <Checkbox
+        checked={viewHidden}
+        label="View Hidden Achievements"
+        onChange={() => changeViewHidden(!viewHidden)}
+      />
     </div>
   );
 }
diff --git a/src/commons/achievement/AchievementTask.tsx b/src/commons/achievement/AchievementTask.tsx
index 67b0911566..ee46f8c364 100644
--- a/src/commons/achievement/AchievementTask.tsx
+++ b/src/commons/achievement/AchievementTask.tsx
@@ -19,7 +19,7 @@ function AchievementTask(props: AchievementTaskProps) {
 
   const inferencer = useContext(AchievementContext);
   const prerequisiteUuids = [...inferencer.getImmediateChildren(uuid)];
-  const taskColor = getAbilityColor(inferencer.getAchievement(uuid).ability);
+  const taskColor = getAbilityColor();
 
   const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
   const toggleDropdown = () => setIsDropdownOpen(!isDropdownOpen);
diff --git a/src/commons/achievement/AchievementView.tsx b/src/commons/achievement/AchievementView.tsx
index cc6344741d..5e22421747 100644
--- a/src/commons/achievement/AchievementView.tsx
+++ b/src/commons/achievement/AchievementView.tsx
@@ -32,7 +32,7 @@ function AchievementView(props: AchievementViewProps) {
   }
 
   const achievement = inferencer.getAchievement(focusUuid);
-  const { ability, deadline, title, view } = achievement;
+  const { deadline, title, view } = achievement;
   const { coverImage, completionText, description } = view;
   const awardedXp = inferencer.getAchievementXp(focusUuid);
   const goals = inferencer.listGoals(focusUuid);
@@ -40,11 +40,12 @@ function AchievementView(props: AchievementViewProps) {
   const status = inferencer.getStatus(focusUuid);
 
   return (
-    <div className="view" style={{ ...getAbilityGlow(ability), ...getAbilityBackground(ability) }}>
+    <div className="view" style={{ ...getAbilityGlow(), ...getAbilityBackground() }}>
       <div
         className="cover"
         style={{
-          background: `url(${coverImage}) center/cover`
+          background: `rgba(0, 0, 0, 0.5) url(${coverImage}) center/cover`,
+          backgroundBlendMode: `darken`
         }}
       >
         <h1>{title.toUpperCase()}</h1>
diff --git a/src/commons/achievement/card/AchievementDeadline.tsx b/src/commons/achievement/card/AchievementDeadline.tsx
index b70776387f..e33697624b 100644
--- a/src/commons/achievement/card/AchievementDeadline.tsx
+++ b/src/commons/achievement/card/AchievementDeadline.tsx
@@ -2,25 +2,20 @@ import { Icon } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 
 import { DeadlineColors } from '../../../features/achievement/AchievementConstants';
-import { AchievementAbility } from '../../../features/achievement/AchievementTypes';
 import { isExpired, prettifyDeadline, timeFromExpired } from '../utils/DateHelper';
 
 type AchievementDeadlineProps = {
-  ability: AchievementAbility;
   deadline?: Date;
 };
 
 const twoDays = new Date(0, 0, 2).getTime() - new Date(0, 0, 0).getTime();
 
 function AchievementDeadline(props: AchievementDeadlineProps) {
-  const { ability, deadline } = props;
+  const { deadline } = props;
 
   // red deadline color for core achievements that are expiring in less than 2 days
   const deadlineColor =
-    ability === AchievementAbility.CORE &&
-    deadline !== undefined &&
-    !isExpired(deadline) &&
-    timeFromExpired(deadline) <= twoDays
+    deadline !== undefined && !isExpired(deadline) && timeFromExpired(deadline) <= twoDays
       ? DeadlineColors.RED
       : DeadlineColors.BLACK;
 
diff --git a/src/commons/achievement/control/achievementEditor/AchievementSettings.tsx b/src/commons/achievement/control/achievementEditor/AchievementSettings.tsx
index 7589242e17..2338508f2c 100644
--- a/src/commons/achievement/control/achievementEditor/AchievementSettings.tsx
+++ b/src/commons/achievement/control/achievementEditor/AchievementSettings.tsx
@@ -1,4 +1,4 @@
-import { Button, Dialog, EditableText } from '@blueprintjs/core';
+import { Button, Checkbox, Dialog, EditableText } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { Tooltip2 } from '@blueprintjs/popover2';
 import { useState } from 'react';
@@ -58,9 +58,13 @@ function AchievementSettings(props: AchievementSettingsProps) {
           />
           <h3>Goals</h3>
           <EditableGoalUuids changeGoalUuids={changeGoalUuids} goalUuids={goalUuids} />
-          <Tooltip2 content="The rewarded XP will be equal to the sum of 'count' of goals">
-            <Button text={'Variable XP?'} active={isVariableXp} onClick={changeIsVariableXp} />
-          </Tooltip2>
+
+          <h3>Variable XP</h3>
+          <Checkbox
+            label={"The rewarded XP will be equal to the sum of 'count' of goals"}
+            checked={isVariableXp}
+            onChange={changeIsVariableXp}
+          />
         </div>
       </Dialog>
     </>
diff --git a/src/commons/achievement/control/achievementEditor/AchievementTemplate.ts b/src/commons/achievement/control/achievementEditor/AchievementTemplate.ts
index 836ebba849..26a148ad4d 100644
--- a/src/commons/achievement/control/achievementEditor/AchievementTemplate.ts
+++ b/src/commons/achievement/control/achievementEditor/AchievementTemplate.ts
@@ -3,7 +3,6 @@ import {
   coverImageUrl
 } from '../../../../features/achievement/AchievementConstants';
 import {
-  AchievementAbility,
   AchievementItem,
   AchievementView
 } from '../../../../features/achievement/AchievementTypes';
@@ -17,7 +16,6 @@ export const viewTemplate: AchievementView = {
 export const achievementTemplate: AchievementItem = {
   uuid: '',
   title: 'Achievement Title Here',
-  ability: AchievementAbility.CORE,
   xp: 0,
   isVariableXp: false,
   isTask: false,
diff --git a/src/commons/achievement/control/achievementEditor/EditableAbility.tsx b/src/commons/achievement/control/achievementEditor/EditableAbility.tsx
deleted file mode 100644
index 5f20127cc0..0000000000
--- a/src/commons/achievement/control/achievementEditor/EditableAbility.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Button, MenuItem } from '@blueprintjs/core';
-import { Tooltip2 } from '@blueprintjs/popover2';
-import { ItemRenderer, Select } from '@blueprintjs/select';
-import { AchievementAbility } from 'src/features/achievement/AchievementTypes';
-
-type EditableAbilityProps = {
-  ability: AchievementAbility;
-  changeAbility: (ability: AchievementAbility) => void;
-};
-
-function EditableAbility(props: EditableAbilityProps) {
-  const { ability, changeAbility } = props;
-
-  const AbilitySelect = Select.ofType<AchievementAbility>();
-
-  const abilityRenderer: ItemRenderer<AchievementAbility> = (ability, { handleClick }) => (
-    <MenuItem key={ability} onClick={handleClick} text={ability} />
-  );
-
-  return (
-    <Tooltip2 content="Change Ability">
-      <AbilitySelect
-        filterable={false}
-        itemRenderer={abilityRenderer}
-        items={Object.values(AchievementAbility)}
-        onItemSelect={changeAbility}
-      >
-        <Button minimal={true} outlined={true} text={ability} />
-      </AbilitySelect>
-    </Tooltip2>
-  );
-}
-
-export default EditableAbility;
diff --git a/src/commons/achievement/control/achievementEditor/EditableCard.tsx b/src/commons/achievement/control/achievementEditor/EditableCard.tsx
index 0f9ada24bb..d52d715f6c 100644
--- a/src/commons/achievement/control/achievementEditor/EditableCard.tsx
+++ b/src/commons/achievement/control/achievementEditor/EditableCard.tsx
@@ -6,14 +6,12 @@ import { useContext, useMemo, useReducer, useState } from 'react';
 
 import { AchievementContext } from '../../../../features/achievement/AchievementConstants';
 import {
-  AchievementAbility,
   AchievementItem,
   AchievementView
 } from '../../../../features/achievement/AchievementTypes';
 import ItemDeleter from '../common/ItemDeleter';
 import ItemSaver from '../common/ItemSaver';
 import AchievementSettings from './AchievementSettings';
-import EditableAbility from './EditableAbility';
 import {
   EditableCardAction as Action,
   EditableCardActionType as ActionType,
@@ -51,14 +49,6 @@ const reducer = (state: State, action: Action) => {
         ...state,
         isDirty: false
       };
-    case ActionType.CHANGE_ABILITY:
-      return {
-        editableAchievement: {
-          ...state.editableAchievement,
-          ability: action.payload
-        },
-        isDirty: true
-      };
     case ActionType.CHANGE_CARD_BACKGROUND:
       return {
         editableAchievement: {
@@ -155,7 +145,7 @@ function EditableCard(props: EditableCardProps) {
   const [state, dispatch] = useReducer(reducer, achievementClone, init);
   const [isNew, setIsNew] = useState<boolean>(isNewAchievement);
   const { editableAchievement, isDirty } = state;
-  const { ability, cardBackground, deadline, release, title, view, xp } = editableAchievement;
+  const { cardBackground, deadline, release, title, view, xp } = editableAchievement;
 
   const saveChanges = () => {
     dispatch({ type: ActionType.SAVE_CHANGES });
@@ -181,9 +171,6 @@ function EditableCard(props: EditableCardProps) {
     requestPublish();
   };
 
-  const changeAbility = (ability: AchievementAbility) =>
-    dispatch({ type: ActionType.CHANGE_ABILITY, payload: ability });
-
   const changeCardBackground = (cardBackground: string) =>
     dispatch({ type: ActionType.CHANGE_CARD_BACKGROUND, payload: cardBackground });
 
@@ -245,7 +232,6 @@ function EditableCard(props: EditableCardProps) {
           </Tooltip2>
         </div>
         <div className="details">
-          <EditableAbility ability={ability} changeAbility={changeAbility} />
           <EditableDate changeDate={changeRelease} date={release} type="Release" />
           <EditableDate changeDate={changeDeadline} date={deadline} type="Deadline" />
         </div>
diff --git a/src/commons/achievement/control/achievementEditor/EditableCardTypes.ts b/src/commons/achievement/control/achievementEditor/EditableCardTypes.ts
index 2bd1f66d00..f04157f6a6 100644
--- a/src/commons/achievement/control/achievementEditor/EditableCardTypes.ts
+++ b/src/commons/achievement/control/achievementEditor/EditableCardTypes.ts
@@ -1,11 +1,6 @@
-import {
-  AchievementAbility,
-  AchievementItem,
-  AchievementView
-} from 'src/features/achievement/AchievementTypes';
+import { AchievementItem, AchievementView } from 'src/features/achievement/AchievementTypes';
 
 export enum EditableCardActionType {
-  CHANGE_ABILITY = 'CHANGE_ABILITY',
   CHANGE_CARD_BACKGROUND = 'CHANGE_CARD_BACKGROUND',
   CHANGE_DEADLINE = 'CHANGE_DEADLINE',
   CHANGE_GOAL_UUIDS = 'CHANGE_GOAL_UUIDS',
@@ -22,10 +17,6 @@ export enum EditableCardActionType {
 }
 
 export type EditableCardAction =
-  | {
-      type: EditableCardActionType.CHANGE_ABILITY;
-      payload: AchievementAbility;
-    }
   | {
       type: EditableCardActionType.CHANGE_CARD_BACKGROUND;
       payload: string;
diff --git a/src/commons/achievement/control/achievementEditor/achievementSettings/EditableGoalUuids.tsx b/src/commons/achievement/control/achievementEditor/achievementSettings/EditableGoalUuids.tsx
index dc955c793d..5af9df0e44 100644
--- a/src/commons/achievement/control/achievementEditor/achievementSettings/EditableGoalUuids.tsx
+++ b/src/commons/achievement/control/achievementEditor/achievementSettings/EditableGoalUuids.tsx
@@ -1,8 +1,9 @@
 import { MenuItem } from '@blueprintjs/core';
-import { ItemRenderer, MultiSelect } from '@blueprintjs/select';
+import { ItemPredicate, ItemRenderer, MultiSelect } from '@blueprintjs/select';
 import { without } from 'lodash';
 import { useContext } from 'react';
 import { AchievementContext } from 'src/features/achievement/AchievementConstants';
+import { AchievementGoal } from 'src/features/achievement/AchievementTypes';
 
 type EditableGoalUuidsProps = {
   changeGoalUuids: (goalUuids: string[]) => void;
@@ -19,12 +20,13 @@ function EditableGoalUuids(props: EditableGoalUuidsProps) {
   );
 
   const getUuid = (text: string) => inferencer.getUuidByText(text);
-  const getText = (uuid: string) => inferencer.getTextByUuid(uuid);
 
-  const GoalSelect = MultiSelect.ofType<string>();
-  const goalRenderer: ItemRenderer<string> = (uuid, { handleClick }) => (
-    <MenuItem key={uuid} onClick={handleClick} text={getText(uuid)} />
+  const GoalSelect = MultiSelect.ofType<AchievementGoal>();
+  const goalRenderer: ItemRenderer<AchievementGoal> = (goal, { handleClick }) => (
+    <MenuItem key={goal.uuid} onClick={handleClick} text={goal.text} />
   );
+  const goalPredicate: ItemPredicate<AchievementGoal> = (query, item) =>
+    item.text.toLowerCase().includes(query.toLowerCase());
 
   const selectedGoals = new Set(selectedUuids);
   const availableGoals = new Set(without(allGoalUuids, ...goalUuids));
@@ -36,22 +38,24 @@ function EditableGoalUuids(props: EditableGoalUuidsProps) {
   };
 
   const removeGoal = (removeUuid?: string) => {
-    if (removeUuid === undefined) return;
+    if (removeGoal === undefined) return;
 
-    selectedGoals.delete(removeUuid);
-    availableGoals.add(removeUuid);
+    selectedGoals.delete(removeUuid!);
+    availableGoals.add(removeUuid!);
     changeGoalUuids([...selectedGoals]);
   };
 
   return (
     <GoalSelect
       itemRenderer={goalRenderer}
-      items={[...availableGoals]}
+      items={[...availableGoals].map(uuid => inferencer.getGoal(uuid))}
       noResults={<MenuItem disabled={true} text="No available goal" />}
-      onItemSelect={selectGoal}
-      selectedItems={[...selectedGoals]}
+      onItemSelect={goal => selectGoal(goal.uuid)}
+      selectedItems={[...selectedGoals].map(uuid => inferencer.getGoal(uuid))}
       tagInputProps={{ onRemove: text => removeGoal(getUuid(text!.toString())) }}
-      tagRenderer={getText}
+      tagRenderer={goal => goal.text}
+      itemPredicate={goalPredicate}
+      resetOnSelect={true}
     />
   );
 }
diff --git a/src/commons/achievement/control/achievementEditor/achievementSettings/EditablePrerequisiteUuids.tsx b/src/commons/achievement/control/achievementEditor/achievementSettings/EditablePrerequisiteUuids.tsx
index 88336f2a6b..71ae238334 100644
--- a/src/commons/achievement/control/achievementEditor/achievementSettings/EditablePrerequisiteUuids.tsx
+++ b/src/commons/achievement/control/achievementEditor/achievementSettings/EditablePrerequisiteUuids.tsx
@@ -1,7 +1,9 @@
 import { MenuItem } from '@blueprintjs/core';
-import { ItemRenderer, MultiSelect } from '@blueprintjs/select';
+import { ItemPredicate, ItemRenderer, MultiSelect } from '@blueprintjs/select';
+import { without } from 'lodash';
 import { useContext } from 'react';
 import { AchievementContext } from 'src/features/achievement/AchievementConstants';
+import { AchievementItem } from 'src/features/achievement/AchievementTypes';
 
 type EditablePrerequisiteUuidsProps = {
   changePrerequisiteUuids: (prerequisiteUuids: string[]) => void;
@@ -19,15 +21,16 @@ function EditablePrerequisiteUuids(props: EditablePrerequisiteUuidsProps) {
   );
 
   const getUuid = (title: string) => inferencer.getUuidByTitle(title);
-  const getTitle = (uuid: string) => inferencer.getTitleByUuid(uuid);
 
-  const PrerequisiteSelect = MultiSelect.ofType<string>();
-  const prerequisiteRenderer: ItemRenderer<string> = (uuid, { handleClick }) => (
-    <MenuItem key={uuid} onClick={handleClick} text={getTitle(uuid)} />
+  const PrerequisiteSelect = MultiSelect.ofType<AchievementItem>();
+  const prerequisiteRenderer: ItemRenderer<AchievementItem> = (achievement, { handleClick }) => (
+    <MenuItem key={achievement.uuid} onClick={handleClick} text={achievement.title} />
   );
+  const prerequisitePredicate: ItemPredicate<AchievementItem> = (query, item) =>
+    item.title.toLowerCase().includes(query.toLowerCase());
 
   const selectedPrereqs = new Set(selectedUuids);
-  const availablePrereqs = new Set(availableUuids);
+  const availablePrereqs = new Set(without(availableUuids, ...selectedUuids));
 
   const selectPrereq = (selectUuid: string) => {
     selectedPrereqs.add(selectUuid);
@@ -46,12 +49,14 @@ function EditablePrerequisiteUuids(props: EditablePrerequisiteUuidsProps) {
   return (
     <PrerequisiteSelect
       itemRenderer={prerequisiteRenderer}
-      items={[...availablePrereqs]}
+      items={[...availablePrereqs].map(uuid => inferencer.getAchievement(uuid))}
       noResults={<MenuItem disabled={true} text="No available achievement" />}
-      onItemSelect={selectPrereq}
-      selectedItems={[...selectedPrereqs]}
+      onItemSelect={achievement => selectPrereq(achievement.uuid)}
+      selectedItems={[...selectedPrereqs].map(uuid => inferencer.getAchievement(uuid))}
       tagInputProps={{ onRemove: title => removePrereq(getUuid(title!.toString())) }}
-      tagRenderer={getTitle}
+      tagRenderer={achievement => achievement.title}
+      itemPredicate={prerequisitePredicate}
+      resetOnSelect={true}
     />
   );
 }
diff --git a/src/commons/achievement/utils/AchievementBackender.ts b/src/commons/achievement/utils/AchievementBackender.ts
index 11dd76fcb9..dff95395b3 100644
--- a/src/commons/achievement/utils/AchievementBackender.ts
+++ b/src/commons/achievement/utils/AchievementBackender.ts
@@ -1,5 +1,4 @@
 import {
-  AchievementAbility,
   AchievementGoal,
   AchievementItem,
   GoalDefinition,
@@ -38,7 +37,6 @@ export const frontendifyAchievementItem = (achievement: any) =>
   ({
     uuid: achievement.uuid || '',
     title: achievement.title || '',
-    ability: achievement.ability as AchievementAbility,
     xp: achievement.xp,
     isVariableXp: achievement.isVariableXp,
     deadline: achievement.deadline === null ? undefined : new Date(achievement.deadline),
diff --git a/src/commons/achievement/utils/AchievementInferencer.ts b/src/commons/achievement/utils/AchievementInferencer.ts
index 78a87ca0ea..f51644d76d 100644
--- a/src/commons/achievement/utils/AchievementInferencer.ts
+++ b/src/commons/achievement/utils/AchievementInferencer.ts
@@ -3,7 +3,6 @@ import { v4 } from 'uuid';
 
 import { showDangerMessage } from '../../../commons/utils/NotificationsHelper';
 import {
-  AchievementAbility,
   AchievementGoal,
   AchievementItem,
   AchievementStatus,
@@ -86,7 +85,6 @@ class AchievementInferencer {
   private invalidAchievement: AchievementItem = {
     uuid: 'invalid',
     title: 'invalid',
-    ability: AchievementAbility.EXPLORATION,
     xp: 0,
     isVariableXp: false,
     deadline: undefined,
@@ -495,6 +493,15 @@ class AchievementInferencer {
       .map(sortedTask => sortedTask.uuid);
   }
 
+  /**
+   * Returns an array of achievementId sorted by position
+   */
+  public listAllSortedAchievementUuids() {
+    return this.getAllAchievements()
+      .sort((taskA, taskB) => taskA.position - taskB.position)
+      .map(sortedTask => sortedTask.uuid);
+  }
+
   /**
    * Returns whether an achievement is completed or not.
    *
diff --git a/src/commons/achievement/utils/InsertFakeAchievements.ts b/src/commons/achievement/utils/InsertFakeAchievements.ts
index 434790a97d..6ec6c1ab53 100644
--- a/src/commons/achievement/utils/InsertFakeAchievements.ts
+++ b/src/commons/achievement/utils/InsertFakeAchievements.ts
@@ -1,8 +1,5 @@
-import {
-  cardBackgroundUrl,
-  coverImageUrl
-} from '../../../features/achievement/AchievementConstants';
-import { AchievementAbility, GoalType } from '../../../features/achievement/AchievementTypes';
+import { cardBackgroundUrl } from '../../../features/achievement/AchievementConstants';
+import { GoalType } from '../../../features/achievement/AchievementTypes';
 import { AssessmentOverview } from '../../assessment/AssessmentTypes';
 import AchievementInferencer from './AchievementInferencer';
 import { isExpired, isReleased } from './DateHelper';
@@ -52,10 +49,6 @@ function insertFakeAchievements(
     inferencer.insertFakeAchievement({
       uuid: idString,
       title: assessmentOverview.title,
-      ability:
-        assessmentOverview.type === 'Missions' || assessmentOverview.type === 'Paths'
-          ? AchievementAbility.CORE
-          : AchievementAbility.EFFORT,
       xp:
         assessmentOverview.gradingStatus === 'graded'
           ? assessmentOverview.xp
@@ -69,7 +62,7 @@ function insertFakeAchievements(
       goalUuids: [idString + '0', idString + '1'], // need to create a mock completed goal to reference to be considered complete
       cardBackground: `${cardBackgroundUrl}/default.png`,
       view: {
-        coverImage: `${coverImageUrl}/default.png`,
+        coverImage: assessmentOverview.coverImage,
         description: assessmentOverview.shortSummary,
         completionText: `XP: ${assessmentOverview.xp} / ${assessmentOverview.maxXp}`
       }
diff --git a/src/commons/achievement/utils/__tests__/AchievementInferencer.test.ts b/src/commons/achievement/utils/__tests__/AchievementInferencer.test.ts
index 934de898c6..73e7cf6d46 100644
--- a/src/commons/achievement/utils/__tests__/AchievementInferencer.test.ts
+++ b/src/commons/achievement/utils/__tests__/AchievementInferencer.test.ts
@@ -1,6 +1,5 @@
 import { mockAchievements, mockGoals } from 'src/commons/mocks/AchievementMocks';
 import {
-  AchievementAbility,
   AchievementGoal,
   AchievementItem,
   AchievementStatus,
@@ -15,7 +14,6 @@ import AchievementInferencer from '../AchievementInferencer';
 const testAchievement: AchievementItem = {
   uuid: '0',
   title: 'Test Achievement',
-  ability: AchievementAbility.CORE,
   xp: 100,
   isVariableXp: false,
   isTask: false,
diff --git a/src/commons/mocks/AchievementMocks.ts b/src/commons/mocks/AchievementMocks.ts
index dea737e283..2c919c347b 100644
--- a/src/commons/mocks/AchievementMocks.ts
+++ b/src/commons/mocks/AchievementMocks.ts
@@ -1,5 +1,4 @@
 import {
-  AchievementAbility,
   AchievementGoal,
   AchievementItem,
   GoalType
@@ -10,7 +9,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '0',
     title: 'Rune Master',
-    ability: AchievementAbility.CORE,
     xp: 100,
     isVariableXp: false,
     isTask: true,
@@ -30,7 +28,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '1',
     title: 'Beyond the Second Dimension',
-    ability: AchievementAbility.CORE,
     xp: 100,
     isVariableXp: false,
     deadline: new Date(2020, 7, 6, 12, 30, 0),
@@ -51,7 +48,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '2',
     title: 'Colorful Carpet',
-    ability: AchievementAbility.CORE,
     xp: 100,
     isVariableXp: false,
     deadline: new Date(2020, 7, 8, 9, 0, 0),
@@ -72,7 +68,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '3',
     title: '',
-    ability: AchievementAbility.CORE,
     xp: 100,
     isVariableXp: false,
     isTask: false,
@@ -89,7 +84,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '4',
     title: 'Curve Wizard',
-    ability: AchievementAbility.CORE,
     xp: 100,
     isVariableXp: false,
     deadline: new Date(2020, 8, 15, 0, 0, 0),
@@ -110,7 +104,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '5',
     title: 'Curve Introduction',
-    ability: AchievementAbility.CORE,
     xp: 100,
     isVariableXp: false,
     deadline: new Date(2020, 7, 28, 0, 0, 0),
@@ -131,7 +124,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '6',
     title: 'Curve Manipulation',
-    ability: AchievementAbility.CORE,
     xp: 100,
     isVariableXp: false,
     deadline: new Date(2020, 8, 5, 0, 0, 0),
@@ -152,7 +144,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '21',
     title: 'The Source-rer',
-    ability: AchievementAbility.EFFORT,
     xp: 100,
     isVariableXp: false,
     deadline: new Date(2020, 7, 21, 0, 0, 0),
@@ -173,7 +164,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '8',
     title: 'Power of Friendship',
-    ability: AchievementAbility.COMMUNITY,
     xp: 100,
     isVariableXp: false,
     isTask: true,
@@ -193,7 +183,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '9',
     title: 'Piazza Guru',
-    ability: AchievementAbility.COMMUNITY,
     xp: 100,
     isVariableXp: false,
     isTask: false,
@@ -213,7 +202,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '16',
     title: "That's the Spirit",
-    ability: AchievementAbility.EXPLORATION,
     xp: 100,
     isVariableXp: false,
     isTask: true,
@@ -233,7 +221,6 @@ export const mockAchievements: AchievementItem[] = [
   {
     uuid: '13',
     title: 'Kool Kidz',
-    ability: AchievementAbility.FLEX,
     xp: 100,
     isVariableXp: false,
     isTask: true,
diff --git a/src/commons/sagas/AchievementSaga.ts b/src/commons/sagas/AchievementSaga.ts
index 9511bd58ee..36d4520d64 100644
--- a/src/commons/sagas/AchievementSaga.ts
+++ b/src/commons/sagas/AchievementSaga.ts
@@ -17,6 +17,7 @@ import {
   UPDATE_GOAL_PROGRESS,
   UPDATE_OWN_GOAL_PROGRESS
 } from '../../features/achievement/AchievementTypes';
+import { updateGoalProcessed } from '../achievement/AchievementManualEditor';
 import AchievementInferencer from '../achievement/utils/AchievementInferencer';
 import { goalIncludesEvents, incrementCount } from '../achievement/utils/EventHandler';
 import { OverallState } from '../application/ApplicationTypes';
@@ -88,9 +89,9 @@ export default function* AchievementSaga(): SagaIterator {
   yield takeEvery(GET_GOALS, function* (action: ReturnType<typeof actions.getGoals>): any {
     const tokens: Tokens = yield selectTokens();
 
-    const studentId = action.payload;
+    const studentCourseRegId = action.payload;
 
-    const goals = yield call(getGoals, tokens, studentId);
+    const goals = yield call(getGoals, tokens, studentCourseRegId);
 
     if (goals) {
       yield put(actions.saveGoals(goals));
@@ -171,6 +172,10 @@ export default function* AchievementSaga(): SagaIterator {
       if (!resp) {
         return;
       }
+      if (resp.ok) {
+        yield put(actions.getGoals(studentCourseRegId));
+        updateGoalProcessed();
+      }
     }
   );
 
diff --git a/src/commons/sagas/RequestsSaga.ts b/src/commons/sagas/RequestsSaga.ts
index b045ea5540..d090e31a3c 100644
--- a/src/commons/sagas/RequestsSaga.ts
+++ b/src/commons/sagas/RequestsSaga.ts
@@ -241,13 +241,13 @@ export const getAchievements = async (tokens: Tokens): Promise<AchievementItem[]
 };
 
 /**
- * GET /courses/{courseId}/achievements/goals/{studentId}
+ * GET /courses/{courseId}/admin/users/{studentCourseRegId}/goals
  */
 export const getGoals = async (
   tokens: Tokens,
-  studentId: number
+  studentCourseRegId: number
 ): Promise<AchievementGoal[] | null> => {
-  const resp = await request(`${courseId()}/achievements/goals/${studentId}`, 'GET', {
+  const resp = await request(`${courseId()}/admin/users/${studentCourseRegId}/goals`, 'GET', {
     ...tokens,
     shouldRefresh: true
   });
diff --git a/src/features/achievement/AchievementActions.ts b/src/features/achievement/AchievementActions.ts
index dde12ba83e..601db78c24 100644
--- a/src/features/achievement/AchievementActions.ts
+++ b/src/features/achievement/AchievementActions.ts
@@ -31,7 +31,7 @@ export const bulkUpdateGoals = (goals: GoalDefinition[]) => action(BULK_UPDATE_G
 
 export const getAchievements = () => action(GET_ACHIEVEMENTS);
 
-export const getGoals = (studentId: number) => action(GET_GOALS, studentId);
+export const getGoals = (studentCourseRegId: number) => action(GET_GOALS, studentCourseRegId);
 
 export const getOwnGoals = () => action(GET_OWN_GOALS);
 
diff --git a/src/features/achievement/AchievementConstants.ts b/src/features/achievement/AchievementConstants.ts
index 1cc50be447..aacfae36d5 100644
--- a/src/features/achievement/AchievementConstants.ts
+++ b/src/features/achievement/AchievementConstants.ts
@@ -2,7 +2,7 @@ import React from 'react';
 
 import AchievementInferencer from '../../commons/achievement/utils/AchievementInferencer';
 import { Links } from '../../commons/utils/Constants';
-import { AchievementAbility, FilterStatus } from './AchievementTypes';
+import { FilterStatus } from './AchievementTypes';
 
 export const AchievementContext = React.createContext(new AchievementInferencer([], []));
 
@@ -21,7 +21,13 @@ export const backgroundUrl = `${achievementAssets}/view-background`;
 export const cardBackgroundUrl = `${achievementAssets}/card-background`;
 export const coverImageUrl = `${achievementAssets}/cover-image`;
 
-export const getAbilityBackground = (ability: AchievementAbility) => {
+// Keeping these urls in as comments in case future changes want to use them
+
+export const getAbilityBackground = () => {
+  return {
+    background: `url(${backgroundUrl}/exploration.png) no-repeat center/cover`
+  };
+  /*
   switch (ability) {
     case AchievementAbility.CORE:
       return {
@@ -48,9 +54,12 @@ export const getAbilityBackground = (ability: AchievementAbility) => {
         background: ``
       };
   }
+  */
 };
 
-export const getAbilityColor = (ability: AchievementAbility) => {
+export const getAbilityColor = () => {
+  return '#9ce'; // blue
+  /*
   switch (ability) {
     case AchievementAbility.CORE:
       return '#fb0'; // gold
@@ -65,27 +74,33 @@ export const getAbilityColor = (ability: AchievementAbility) => {
     default:
       return '';
   }
+  */
 };
 
-export const getAbilityGlow = (ability: AchievementAbility) =>
+export const getAbilityGlow = () => ({
+  border: `1px solid ${getAbilityColor()}`,
+  boxShadow: `0 0 10px ${getAbilityColor()}`
+});
+/*
   ability === AchievementAbility.FLEX
     ? {
         border: `1px solid ${getAbilityColor(ability)}`,
         boxShadow: `
-          0 0 10px #ff0,   /* yellow */
-          -1px 0 9px #f0f, /* magenta */
-          1px 0 9px #0ff   /* cyan */`
+          0 0 10px #ff0,   
+          -1px 0 9px #f0f, 
+          1px 0 9px #0ff`
       }
     : {
         border: `1px solid ${getAbilityColor(ability)}`,
         boxShadow: `0 0 10px ${getAbilityColor(ability)}`
       };
+  */
 
 export const getFilterColor = (globalStatus: FilterStatus, ownStatus: FilterStatus) =>
   globalStatus === ownStatus ? FilterColors.BLUE : FilterColors.WHITE;
 
-// Make selected achievements + view and Flex achievements glow
-export const handleGlow = (uuid: string, focusUuid: string, ability: AchievementAbility) =>
-  ability === AchievementAbility.FLEX || uuid === focusUuid ? getAbilityGlow(ability) : undefined;
+// Make selected achievement + view glow
+export const handleGlow = (uuid: string, focusUuid: string) =>
+  uuid === focusUuid ? getAbilityGlow() : undefined;
 
 export const xpPerLevel = 1000;
diff --git a/src/features/achievement/AchievementTypes.ts b/src/features/achievement/AchievementTypes.ts
index 5e3abe3e14..67bba402ca 100644
--- a/src/features/achievement/AchievementTypes.ts
+++ b/src/features/achievement/AchievementTypes.ts
@@ -18,14 +18,6 @@ export const SAVE_USERS = 'SAVE_USERS';
 export const UPDATE_GOAL_PROGRESS = 'UPDATE_GOAL_PROGRESS';
 export const UPDATE_OWN_GOAL_PROGRESS = 'UPDATE_OWN_GOAL_PROGRESS';
 
-export enum AchievementAbility {
-  CORE = 'Core',
-  EFFORT = 'Effort',
-  EXPLORATION = 'Exploration',
-  COMMUNITY = 'Community',
-  FLEX = 'Flex'
-}
-
 export enum AchievementStatus {
   ACTIVE = 'ACTIVE', // deadline not over and not completed
   COMPLETED = 'COMPLETED', // completed, regardless of deadline
@@ -44,7 +36,6 @@ export enum FilterStatus {
  *
  * @param {string} uuid unique uuid of the achievement item
  * @param {string} title title of the achievement
- * @param {AchievementAbility} ability ability of the achievement, string enum
  * @param {number} xp the xp gained when completing the achievement
  * @param {Date} deadline Optional, the deadline of the achievement
  * @param {Date} release Optional, the release date of the achievement
@@ -58,7 +49,6 @@ export enum FilterStatus {
 export type AchievementItem = {
   uuid: string;
   title: string;
-  ability: AchievementAbility;
   xp: number;
   isVariableXp: boolean;
   deadline?: Date;
diff --git a/src/pages/achievement/subcomponents/AchievementDashboard.tsx b/src/pages/achievement/subcomponents/AchievementDashboard.tsx
index 282391e888..7f9a1aeac7 100644
--- a/src/pages/achievement/subcomponents/AchievementDashboard.tsx
+++ b/src/pages/achievement/subcomponents/AchievementDashboard.tsx
@@ -20,6 +20,7 @@ import {
 export type DispatchProps = {
   fetchAssessmentOverviews: () => void;
   getAchievements: () => void;
+  getGoals: (studentId: number) => void;
   getOwnGoals: () => void;
   getUsers: () => void;
   updateGoalProgress: (studentCourseRegId: number, progress: GoalProgress) => void;
@@ -60,6 +61,7 @@ function Dashboard(props: DispatchProps & StateProps) {
   const {
     getAchievements,
     getOwnGoals,
+    getGoals,
     getUsers,
     updateGoalProgress,
     fetchAssessmentOverviews,
@@ -71,13 +73,17 @@ function Dashboard(props: DispatchProps & StateProps) {
     users
   } = props;
 
+  // default nothing selected
+  const userIdState = useState<AchievementUser | undefined>(undefined);
+  const [selectedUser] = userIdState;
+
   /**
    * Fetch the latest achievements and goals from backend when the page is rendered
    */
   useEffect(() => {
-    getOwnGoals();
+    selectedUser ? getGoals(selectedUser.courseRegId) : getOwnGoals();
     getAchievements();
-  }, [getAchievements, getOwnGoals]);
+  }, [selectedUser, getAchievements, getGoals, getOwnGoals]);
 
   if (name && role && !assessmentOverviews) {
     // If assessment overviews are not loaded, fetch them
@@ -85,9 +91,11 @@ function Dashboard(props: DispatchProps & StateProps) {
   }
 
   // one goal for submit, one goal for graded
-  assessmentOverviews?.forEach(assessmentOverview =>
-    insertFakeAchievements(assessmentOverview, inferencer)
-  );
+  if (role === Role.Student) {
+    assessmentOverviews?.forEach(assessmentOverview =>
+      insertFakeAchievements(assessmentOverview, inferencer)
+    );
+  }
 
   const filterState = useState<FilterStatus>(FilterStatus.ALL);
   const [filterStatus] = filterState;
@@ -99,12 +107,20 @@ function Dashboard(props: DispatchProps & StateProps) {
   const focusState = useState<string>('');
   const [focusUuid] = focusState;
 
+  const hiddenState = useState<boolean>(false);
+  const [seeHidden] = hiddenState;
+
   return (
     <AchievementContext.Provider value={inferencer}>
       <div className="AchievementDashboard">
-        <AchievementOverview name={name || 'User'} studio={group || 'Staff'} />
+        <AchievementOverview
+          name={name || 'User'}
+          studio={role === Role.Student ? (group ? group : 'Student') : 'Staff'}
+        />
         {role && role !== Role.Student && (
           <AchievementManualEditor
+            userState={userIdState}
+            hiddenState={hiddenState}
             studio={group || 'Staff'}
             users={users}
             getUsers={getUsers}
@@ -133,7 +149,9 @@ function Dashboard(props: DispatchProps & StateProps) {
 
           <ul className="task-container">
             {generateAchievementTasks(
-              inferencer.listSortedReleasedTaskUuids(),
+              role === Role.Student || !seeHidden
+                ? inferencer.listSortedReleasedTaskUuids()
+                : inferencer.listAllSortedAchievementUuids(),
               filterStatus,
               focusState
             )}
diff --git a/src/pages/achievement/subcomponents/AchievementDashboardContainer.ts b/src/pages/achievement/subcomponents/AchievementDashboardContainer.ts
index b506433e65..c29fe3cf5e 100644
--- a/src/pages/achievement/subcomponents/AchievementDashboardContainer.ts
+++ b/src/pages/achievement/subcomponents/AchievementDashboardContainer.ts
@@ -6,6 +6,7 @@ import { fetchAssessmentOverviews } from '../../../commons/application/actions/S
 import { OverallState } from '../../../commons/application/ApplicationTypes';
 import {
   getAchievements,
+  getGoals,
   getOwnGoals,
   getUsers,
   updateGoalProgress
@@ -26,6 +27,7 @@ const mapDispatchToProps: MapDispatchToProps<DispatchProps, {}> = (dispatch: Dis
     {
       fetchAssessmentOverviews,
       getAchievements,
+      getGoals,
       getOwnGoals,
       getUsers,
       updateGoalProgress