(#19) Redesigned controller slightly to make the ui easier