Enhanced UI

Added the UI content