Updated basic view
Updated basic view