Fixed a few issues. Keyboard not closing. A few still remain