Added include guards
Cleaned up combo box interactions