some ui cleanup and added logging