Fixing xml issues (tabs and typos).

Change-Id: I4b58bb963737b9a4c3df277762b3354d62995290
Merge topic 'refactor_panels' into next

b8b5863 Fixing xml issues (tabs and typos).