Tweaked UI to prevent a bug