Further UI modifications to make this a bit more friendly.