Arrow key func & fixes
Merge - Week 2