Add table to Bills page plus other minor changes