Updates

- organising layout and masthead-header