adding the messaging handling with the push, some UI modifications