Updates for CAS and layouts
Updates

Fixes to UI
Fixes to saving activities
Addition of CAS support