added labels and more buttons WIP