Modify design. Before login is done, still working on after login.