Ui fixes

This is a fix for these issues:
fix #422, fix #79