fixed errors
working...
working...
Merge branch 'new-architecture' of github.com:alulaq2/ion-ux into new-architecture