Updated sandbox with refactored components