Fixed scaling issue, added area/overlay transitions