more changes to global style and layout