display issues and fix localStorage sync