shift clean up and minor ui updates