Bug fixes and add social icons