- Fix button createAlias
- Cleaning code