Pull Request to fix bug #16 and #7

At a minimum, this fixes the Done button's hit area and the crashes on iOS7.