Added labels

Added labels and some minor menu changes to make it work.