- Code cleaning
- UI fixes