Fixed up the last two screens