Added auto filled selection boxes