added labels, moved add label and caption to default object