Fixes to tabular view, and newer features