Closes #7: layout improvements