created custom dashboard; Fixed firing bugs