Added scaling options and transition