Menu layout Fixes