Fixed for current UCAS layout
Merge pull request #1 from ConnorRoberts/master

Fixes for current UCAS layout