Updated flex layout