resolved ui issues