Rejigged UI a little, reincluded dashboard (needs work)