change layout structure, rebase from v1.7
clean repo
prepare enviroment to deploy on heroku