Add OWA support
Fix mode buttons