Build proper menu containers. (take 2)