Disable controller DOM elements before loading scripts. Plus minor fix.