An optical and mechanical design of a sealed, non-round fluid-filled lens capable of providing variation of optical power. The fluid lens includes at least three optical components: at least one mostly rigid optical disc, at least one mostly flexible optical membrane and a layer of a transparent fluid that is in communication via a fluid channel with a reservoir of excess fluid contained in a reservoir that can be accessed to augment the fluid volume inside the fluid lens to change the power of the fluid lens. The fluid lens is capable of providing correction of spherical and astigmatic errors, and utilizes contoured membranes to minimize image aberrations.