Fix layout breakages
Code cleanups
Merge pull request #779 from basho/bug/er/layout-fixes

Fix layout Breakages