Finished up artist form refactor