Added a bunch of headers and label, and did some various visual touchups