some cleanup and added the cancel icon back into project