Fixing few bugs found during testing. Also improving the labeling for some buttons.