UI changes and fixes

Squash for #184