Navi done, Custom done, some changes