Fixed the Dashboard to work with the refactored Serialisable classes.