Some minor UI changes..