some  layout optimizations and fix for the menu width