Added numbered states, changed layout to flexbox