Rebuilt menu to render controls on one page