better sessions handling & updated navigation