-fixed method scope
-formated xml
-fixed incorrect name for @+id's