Fix actionbar toggle problem & do some clean