Moved Header stuff around and made views as close to the same as possible. for next step