Fixed some UI bugs

Fix Issue #85