Added a lot of styling changes