some structural changes and styling