UI Rewrite continued, fixes

Improved UI (again)