Added proper navigation