minor BUT many UI changes