Moved some buttons into ActionBars

Tests may no longer work.