Added new files from re-factoring dashboard code