Added Navigation and View