Bug Fixes

App no longer crashes