Added links and buttons