Misc changes including improved dashboard