Added some more table views to make the exprience better