Complex UI Fixes