Touch up headers, remove align