Integrate Pixate and fix design