[TASK] Prevent highlight on initial load up
[TASK] Change all instances of completed state to succeeded state