tried to improve nav/display