new UI components
reverting non-descript and merging new changes
Merge remote-tracking branch 'origin/temp'