Restructure login view