Add page placeholders + small changes