Pittman merge/UI bugs addressed

Pittman UI bugs fixed