Fix button links and remove buttons