Updated menu,
Added the two levels,
Fixed issues