Add block layout
Merge branch 'master' of https://github.com/danjperron/NoContacWaterDetect