replaced table classes, workin on base layout