Lot of styling updates