Armory page updates and beautification
Running Jsbeautify on these files
Merge