refactor html to make it easier to read
fixed twitter issues and other