wireing more UI elements

refractoring needed