ongoing integration of new user interface and code clean up