more style improvement and show changes