Bugfixes & Cleanup

- Refactored
- Fixed scrolling on gift form for multiple sources