Moved badges to respective activities