17.05.2013 Halfway Refactor AddMenu