Streamlined modes:
- Replaced/fusioned plot frame with effect frame in plot mode

... and did a bit of cleaning up by removing some redundant code.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>