index and login modified