Review from build 3 to build 4 on layout login