More work on entry page