Layout of WAVR and Battery circuits finished