Some UI changes on Invoice screen