Improve global style and presentation