tweaked format and navigation