Refactor layout
Add Zebra_cURL dependency