more changes and improvements on userinterface