Re added edit icons and updated faq