changes to make links appear consistent and partial removal of none