Menu layout & title fixes