implement new layout
Merge branch 'master' of https://github.com/chenyn0U0/beta-informatics

auto merge