added menu-icon, removed user, added header-links with functions