fixed few layout