fix layout and add CSession