updated with first layout