Fix cube start position, and add button
Fix merge conflict