Impelement cancel/done bar pattern, add AddDisciplineActivity