Clean up display and option files
Add auto-complete mode