still trying to get the new layout and the links to work