EntryPointView improvements