Some name changes, better menu image