CLeaned up code to remove actionbar sherlock requirements