optimizations

need to fix back navigation!