[TASK] Rationalise menu rendering process