Initial work on new invoice screen