Slight UI changes for consistency