Layer Definition Tweaks

Layer Definition Work