Fixes #39 - UI Tweaks