Fixes #38 - UI tweaks requested