Minor fixes, GUI improvement, local storage cleaning