Use OL viewport instead of top container to get along with OL 2.13
Upgrade to last OL (based on 2.13.1)
Remove duplicate
Some tidying
Some tidying, commenting