merge home/main activities, add basic preferences activity