adding Proposal, currently can include hours and expenses. Also fix bug in invoice view where we show all hours rather than active hours