Lots of styling changes and some config