tons of styling and fixes