major cleanups to markup and CSS