fix(activity): Tidied activity components.