fixing ui issues
fixing issues