Nicer fix for text wrapping in second-level menu + css tweeks