Added comments and search box