Load JS after layout has been initalized
Handle different JSON messages and comment out test code
Merge remote-tracking branch 'origin/dashboard' into dashboard