B/141

FIxes 141 and cleans up UI Code