Fix bugs (partially changed views/controllers causing exceptions)