Some fixes to device wraps
Add test buttons footer and content