improved nav and colors