Bug fixes IOS App 5.4

closes #250
closes #251