initial commit(layout added)
Merge branch 'trans'