Styling: improved the overall styling