Minor UI changes to lavout