Updated lots of styling