Turned property dropdowns into combo boxes, added fixes for property values

Change-Id: I967c45f66f7512e651ddba5413e9ca1326f46593
Merge "Turned property dropdowns into combo boxes, added fixes for property values"