fixed up styles some, almost done