Fixed so everything we want to show is shown