"Added else statement for preventing edit popup if no item is selected. Moved refresh method. Moved brackets of else if which prevented screen switching"