fixed few UI bugs