fix layout
remove duplicated code
Merge pull request #6 from minipai/develop

fix layout