Adding CaseActivity and fixing intents