Modified view to be separated into 2 tabs