It fixes #202

Hello @demariaa : This is a huge piece of work. I do not know how you can review this because I have revisited so many things. Sorry for that. Also, please disregard potential formatting issues. My next issue after this one is merged is to format datahub the same way we have formatted icat-plus.