Migrate equipment to app2 layout