Small changes to make sure that the right elements are showing in the different modes.