Additional layout fixes

- Removing headers from wrapped pages
- Modified flow