Updated views and logic, dashboard is now 90% done