first step into positioning fixes for legends

Change-Id: Id6c83f907c942a48005338090fc01d9d23045548