Resolved merge conflicts, working dashboard view