More styling & structure changes