Corrected screen switching
Added support for completions