Fixed Merge issues and found the problem w/ keyboard functionality