task#246 shift clean up and minor ui updates