Updated todo and changed link colors