tx details
fix conflict
fix tx details
fix conflict
Merge pull request #416 from bechi/feature/05-layout-details

Feature/05 layout details