Improve navigation of panel