added step4. several layout updates