Set up header, moved layout into application