Issue #2 - UI issues