Fixed one device navbar button missing error class. Removed time class from functions as its not getting used
Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages