revised nodes and tabulars
fixed layout tabular