Restructure linkid integration
Fix logout button