UI - Controller Fixes