Improve navigation between settings and main page