Fix menu rendering.
Pulled changes.