UI improvements; merge conflict resolution; begin FB realtime fetching