Created by: mlutfy
Includes the changes from @yorkshirerose in #1
Also includes changes for the dashboard, since this is the first thing that users see: