Bugfix: Overlapping UI elements