gaia-local#16 - Change to two columns