Navigation improvements and New Colors