Additional tweaks for better display