Combo box population fixes and implementation.

Signed-off-by: Henry J. Wylde <accounts+git@hjwylde.com>
Merge branch 'master' of https://github.com/rtheunissen/KPSmart-Team-4.git