Some fixes and better display