updated header links for temp fix until full migration
smart log-out option rendering
minor cleanup