UI Improvements and structural changes