Reworking UI elements to prepare for Databinding