Navigaions Corrected for new theme