Added links and fixed some functionality