Flow states in two-dimensional Rayleigh-Bénard convection as a function of aspect-ratio and Rayleigh number