Added show keyboard on input focus, cleaned up