More fixes on workoutsetlist
Revert "More fixes on workoutsetlist"

This reverts commit 130a70952556d9dc305735db7e8909668dd19b6c.
Merge branch 'Release2' of https://github.com/COMP231-S63G5/S63G5.git