Modified layout to fit a target later