dashboard improvements
dont know
fixing conflicts