Added combo box and altered layout