Fixing minor UI gliches