Moved position logic to showLayer
Fixed unit properties resolution logic