Dashboard WIP and various code improvements