Reorganise workspace to get styles working