Fixed the controller, removed the enableAction stuff