ui fixes #112 and #113