Made improvments to user navigation