Fixed various elements to pass validation
Merge branch 'dev' into beta