add navigator to layout
improve layouts and test + add Users's structure