Added base view to support new layout structure