Simplifying menu rendering & data structure