variable rename, fix returning to the main screen through the toolbar