Changeset 1098

Don't have the pretty ugly duotone after painting the margins - the system paints the inner portion of the menu after drawing the borders, leaving a 2px margin between the border and the contents. The next fix then will be to include the size of the 2px margin into the menu items