UI Redesign & BugFixes