adjustment to login view
merge with current amazon branch