More radical styling changes