Changed table layout