Tables names are visible now; fixed bugs