Added MenuBuilder, removed unused/redundant methods