- Restored Backup/Restore functionality
- Cleaned up dynamic control padding
- Minor tweaks and fixes