code cleanup , added chosen ui