Merge pull request #27 from Coi-l/master

New sitelayout - lots of small fixes
Adjust program links parsing