Fix push and update UI