Styling tweaks, handle exception scenarios.