Small UI tweaks

Addresses issue 1359