Fixed layout issues. Closes #21.