major changes, added invoice page for metro