UI Fix for Bug #5