Issue#590 minor ui bugs

Closes #590