cleaned up navigation between pages