Core pr 4

Upgrading to OG 2.x and fixes in relation to the front-end design.