layout and title fix