Fix layout
 and Fix Topic