fixing minor bugs in GUI
Auto merge