Merge "Added some smoother transitions to the editor"