Fix GCSE with hotfix, improve styling