fix ui issues