Links and buttons redone