Trade refactored
Foil, signed, altered to trade form
Layout
Trade refactoring