Some fixes on UI