Fixed some bugs in all controllers & UI updates