updating to flex layout