Added table and fancy scrolling