Improve display, main stub