Updated templates to match new Jade standards. Fixed lobby template

Change-Id: I72043f5b3cf3dd0f3901156ef951b2d55f47584b