Layout pages clean up

- Cleaned up layout pages.