Updated task list.
Completed feature + Standardise discard icon with interface
Completed feature + Switch discard and cancel buttons over