Finally keyboard working, and some gui cleanup.