Fix Completer and added "none" layout