Lots of styling and pipeline changes