Enhanced the theme
Enhanced the view rendering