Cover Picture functionality and refactoring