Minor positioning and animation change