Added confirmation dialog and fixed some scaling problems with the transition