Animate schema model toggle + tidy up