updated stucture and styling