useless code removed and minor UI changes