Added ActionBar. Moved some menu functions