Finished the conditional output on new home page