Slight improvements on the layout xml files.