new layout ready for master branch