More styling and layout changes.
More layout and styling. Reverted to previous layout.