Minor cleanup
Support for customizing Flash template