Reworked project-tables