:beetle: some Ui fixes