resize max-width to match 960px, minor bug fixes