Fix a problem with the previous updates, need to avoid setting visibility hidden when a transition is being done to a view which is already displayed, if the view is already displayed do not hide the view.  There are also updates for comments made on the code.