Pre menu rework