Redesign menu setup