rearrange if blocks in workout controller