Design changes, post-preview headeer fix