Trying new layout with table strcuture