fix scope and styles