Fixing the UI
Bugifx