Added appropriate screens for each.