fixed coloring and navigation issues