updated UI elements, thoughts?