updated components placement
updated components placement