Show what needs to be shown

Only show what needs to be shown when it needs to be shown