Fixing minor UI issues