Bug Fixes - Invoices & Settings