Setup more robust and better sample page