Action Bar Sherlock

Some aditional code refactoring