Correct few layout mistakes