Fixed Invoice screen issue