Switched back to EVEAI and started working on layout