Some minor UI changes
Some minor UI changes