removed subdir, added navbar patch