General fixes and added more information

Added more information to the accordion and got rid of the popover