UI changes and transition issue