Localstorage and ui fixes