Improve navigation + GUI update