Dashboard merge master

@mhahn & @guymorita please review and let me know if you find anything wrong here.