Fixed some issues
Updated the Flux DefaultController, and template...