Update navabar login form
format the index
resolved mege conflict