Menu update and clean up