WIP , modifications to layout/fill to support selection in center