added labels, exporting to png, fixed border