Fixes and UI improvements
Version 0.4.2