New UI - Merge menu sections for reduced clicks

1) Merge Advanced Content and Content menus. Having two different sections for Content no longer makes sense with the new UI. Having them separate increases the number of button presses required for navigation and needlessly complicates the UX.

2) Move Kiosk Builder to the Content Section. Having it separate is confusing from a UX perspective.