add models
change ui structure