Implemented changes from issue #53

Different labels on tables and tabs, different location for table, comments bellow tables.