Rearranged layout a bit and added heatsinks