refactored controller some more
temporary bug workaround
looks kinda pretty