Add artwork and fix views