Make enter advance navigation or sign in

 Bug: 3487066
 Also cleaned up the layout

Change-Id: Iaa471ff8fcd793381cb98416493dcf707cbecc29
3 files changed