Move element ids to views where they belong