changed raw headers format
changed page unit test
reverted base layout to match the original template