reorganise as basic view stack with entries and entry