Remove layout page, put everything into one