Update logo link in Branding shape
Update side menu code

Pushed all class changes to shape to avoid rendering after client page
loads
Resolve null reference error
Merge remote-tracking branch 'upstream/master'