fixed buggy ui and conflicting tests, due to some merging errors.