Tidied up error reporting.
Tidied up functionality appearing as reliant services are tested.
Favourite icons now appear but the data is not yet retained.