minor UI cleaning and bug fixing