change layout and add setup
Merge branch 'master' of github.com:morangesolution/bahttext