Added amazon and twitter, cleaned up XML and UI