Some cleanup, add basic autocompletion functionality, layout broken