Feature #346 - Menu section