ProfileButton + some other minor changes