first update to refactor menu panels