Few UI changes in sample project