clean-up and add untidymenu