Add index, try out flexbox instead