Some reordering/minor UI changes