merge with justins css changes