Base code change + basic login navigation added