added some layout
Merge origin/master
added some models