Refactored, and fixed interact adjacent controls