More progress on layout, formatting of header
Looking pretty good