Moved stuff around header to make more consistent