Added login layout and correct layout
merge develop