Updated with table layout