Fixed errors in UI that were introduced by recent changes