Improved FI layout and tables
Early version of the indication column (not finished yet)