Wrap positioning stable without scrollbar, slight menu fixes