Show options in a table to improve readability
Merge branch 'develop'