Added soft keyboard popup, added some comments and TODOs