Remove comment & fix login responsiveness