Adding everything that I was working today to sync - also change on how user is logged and navigation
 Fixing conflict in some files