Cleaned up DB callbacks and settings page work