Fix modal controller binding! + Cleanup O_o