Refactor view controller names and update list button