layout and strings cleanup