Minor changes to make UI more consistent...