Reorganized static files
Also fixed indents previously missed