Changing transition functionality

Trying to pave way for animated transitions.