Revert "Options in a table"

This reverts commit 5813b4ea5af0ca35a97bf14d4347b3082d431b69.