Add location to CFP, fix select style