[#3] Greg, Charles and DJ - refactors the province display flow