Improve layout files

This PR contains two commits.
- The first one applies the formatter to all layout xml files thereby unifying formatting - So that subsequent commits do not mix formatting and functional changes.
- The second one removes some useless parent layout tags.