Integration 3 3

Keyboard fix + Back button fix