Added Invoice Management and various fixes