Even bigger UI changes
Fixing error