Styles fixes around issues