optimized positioning after transition, bug fixes