Changed navigation to the correct views
Modifed some colors