minor UI changes
Minor change on test, cleaning