updated navitgation and modal windows