Issue #25 - UI fixes