Fix some of UX Issue #3