Fix single, page and sidebar stuff