Fixed issues with tabs, now having issues with table view