working on push + UI fixes