Various Fixes, UI improvements, method and controller updates