Fixed compilation errors due to changes in UI