normalize property and layout names, small style and layout changes