UI based fixes

Minor UI fix