fixed few ui issues