Move everything inside the displayable conditional