More Misc UI changes