All of the UI things
resolve conflict