Some interface & login fixes