ux improvements + fixes #58