UI improvements
Merginging issue #49