Some more modifications to make things easier to navigate