4/9 Changes from Li

Implements multiple buttons for feature selection