layout and text fixes