Added keyboard plugin and cleaned up some UI