several ui updates
ui changes (and resolved conflicts)