UI migration into e4 model

Code cleanup
Recreate models for aliases