Added displaying the table and some changes