Add links for logged in users and reorganize the base include a bit