Added choice for tabular or tabularx
Added minipage section