handshaking moved to sep. file
login page markup added