added toggle ui icons and further overall content edits