Ui freeze

Will fix #141