Improve HeartEntry screen