Updated with global styles