Refactored layout on forms / added complete indicator to index