Updated library links and layout references