Cleaned up code, moved all animations back into one picker
due to block id vs class