Changed links and some icons