Small Bug Fixes

Most of the selection and data handling is shifted to the app