working on ui issues.