layout and content fix