- Chnaged RecycleBin icon

- [CFO] fixes for CFO
- other layout fixes
- fixes for some focusing issues