Moved Buttons to Action Bar and fixed all unused import warnings. - JP