Added entry page issue 21