Feature/refactor donwload page

After merging into 'development', this can be released into the wild.