Start on #70 and closes #67. Pesky layout managers