fixed links and added buttons