fixed duplication and incorrect dashboard display