Menu tidy up.