Redesigned menu according to #8