Fix to last change

I think this fixes all of the changes I made in the last minor update. This is what I had with the auto-size plus Ryan's onOptionsItemSelected procedure code.