Added button and link fix