Cleaned up warnings in trade layout xml
Removed redundant layout xml file
Reformatted old layout xml files
Cleaned up warnings in layout xml files