Main view and Login view edited