smarter navbar. knows when localstorage is full
fixed merge conflicts