Button and link fixes