Added the missing elements in UI