Fixing minor issues on UI behavior