a bunch of styling changes and the start of s3