more changes to gui, and a clean up