changed empty links to buttons, added labels