adjust layout based on blue-moon
layout
Merge remote-tracking branch 'origin/master'